Merge from origin/emacs-29

b91f0ee2fcc ; Fix last change
2f69353e4a7 Fix incompatibility with tree-sitter-javascript >= 0.20.2
d49124fc14b Avoid signaling errors from 'pixel-fill-region'
a3987127618 eglot: Add nushell language server
5f56bc1cdfc eglot: Add php-ts-mode to eglot-server-programs
c14c978e3b1 Support kotlin-ts-mode in Eglot

diff --cc lisp/progmodes/eglot.el
index beba268f92341b77cb0fb18cc9f9665df81bdb9b,9eaa92da03e470e1bf15684bfebaa20d61bc8047..df8a287b4f2333d0451faa7c466566dc12f45ba2
--- 1/lisp/progmodes/eglot.el
--- 2/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@@ -283,7 -235,7 +283,8 @@@ automatically).
                                  (erlang-mode . ("erlang_ls" "--transport" "stdio"))
                                  ((yaml-ts-mode yaml-mode) . ("yaml-language-server" "--stdio"))
                                  (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp" "nixd")))
 +                                (nickel-mode . ("nls"))
+                                 ((nushell-mode nushell-ts-mode) . ("nu" "--lsp"))
                                  (gdscript-mode . ("localhost" 6008))
                                  ((fortran-mode f90-mode) . ("fortls"))
                                  (futhark-mode . ("futhark" "lsp"))

diff --cc lisp/progmodes/js.el
Simple merge